Merge from emacs-24; up to r111134
authorGlenn Morris <rgm@gnu.org>
Fri, 4 Jan 2013 19:22:37 +0000 (11:22 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 4 Jan 2013 19:22:37 +0000 (11:22 -0800)
commit25546377c34022c3004d0cd15767710b2fd6732d
tree1d66d565904f5e1c899629bc80ae28cfd322795d
parentbba1b05fe607c6d53493935ac4d0bffa6adc5647
parentbc2fd725dd4e546f298decfe62f4c05ead944662
Merge from emacs-24; up to r111134
13 files changed:
ChangeLog
doc/lispref/ChangeLog
doc/misc/ChangeLog
doc/misc/Makefile.in
doc/misc/makefile.w32-in
lisp/ChangeLog
lisp/net/tramp-sh.el
lisp/progmodes/etags.el
lisp/term.el
src/ChangeLog
src/nsterm.m
src/w32term.c
src/xterm.c